removed sprockets for testing
5 changed files with 5 additions and 6 deletions
+ 1
- 1
Gemfile
@@ -29,7 +29,7 @@ group :doc do |
||
| 29 | 29 |
gem 'sdoc', require: false |
| 30 | 30 |
end |
| 31 | 31 |
|
| 32 |
-gem 'sprockets-rails', :require => 'sprockets/railtie' |
|
| 32 |
+#gem 'sprockets-rails', :require => 'sprockets/railtie' |
|
| 33 | 33 |
gem "therubyracer" |
| 34 | 34 |
gem "less-rails" #Sprockets (what Rails 3.1 uses for its asset pipeline) supports LESS |
| 35 | 35 |
gem 'sass-rails' |
+ 0
- 1
Gemfile.lock
@@ -228,7 +228,6 @@ DEPENDENCIES |
||
| 228 | 228 |
sass-rails |
| 229 | 229 |
sdoc |
| 230 | 230 |
simple_form |
| 231 |
- sprockets-rails |
|
| 232 | 231 |
summernote-rails |
| 233 | 232 |
therubyracer |
| 234 | 233 |
turbolinks |
+ 3
- 1
app/uploaders/avatar_uploader.rb
@@ -19,7 +19,9 @@ class AvatarUploader < CarrierWave::Uploader::Base |
||
| 19 | 19 |
|
| 20 | 20 |
if Rails.env.production? |
| 21 | 21 |
# Include the Sprockets helpers for Rails 3.1+ asset pipeline compatibility if using fog: |
| 22 |
- include Sprockets::Rails::Helper |
|
| 22 |
+ #include Sprockets::Rails::Helper |
|
| 23 |
+ #include Sprockets::Helpers::RailsHelper |
|
| 24 |
+ #include Sprockets::Helpers::IsolatedHelper |
|
| 23 | 25 |
storage :fog |
| 24 | 26 |
end |
| 25 | 27 |
|
+ 0
- 1
app/uploaders/cover_uploader.rb
@@ -19,7 +19,6 @@ class CoverUploader < CarrierWave::Uploader::Base |
||
| 19 | 19 |
|
| 20 | 20 |
if Rails.env.production? |
| 21 | 21 |
# Include the Sprockets helpers for Rails 3.1+ asset pipeline compatibility if using fog: |
| 22 |
- include Sprockets::Rails::Helper |
|
| 23 | 22 |
storage :fog |
| 24 | 23 |
end |
| 25 | 24 |
|
+ 1
- 2
app/uploaders/file_uploader.rb
@@ -17,8 +17,7 @@ class FileUploader < CarrierWave::Uploader::Base |
||
| 17 | 17 |
end |
| 18 | 18 |
|
| 19 | 19 |
if Rails.env.production? |
| 20 |
- # Include the Sprockets helpers for Rails 3.1+ asset pipeline compatibility if using fog: |
|
| 21 |
- include Sprockets::Helpers::RailsHelper |
|
| 20 |
+ # Include the Sprockets helpers for Rails 3.1+ asset pipeline compatibility if using fog: |
|
| 22 | 21 |
storage :fog |
| 23 | 22 |
end |
| 24 | 23 |
|